Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 20 Jan 2010 21:55:26 +0000 (21:55 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 20 Jan 2010 21:55:26 +0000 (21:55 +0000)

Trivial merge